debian-packages/ddbus
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Allow structs with non-marshaled non-canDBus fields (#28)

Browse source
This commit is contained in:
thaven 2017-11-04 15:12:56 +01:00 • committed by GitHub
parent 279c3ab00b
commit 99cb6cb071
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
source/ddbus/util.d
View file

@ -86,7 +86,7 @@ template canDBus(T) {
} else static if(isAssociativeArray!T) {
enum canDBus = basicDBus!(KeyType!T) && canDBus!(ValueType!T);
} else static if(is(T == struct) && !isInstanceOf!(DictionaryEntry, T)) {
enum canDBus = allCanDBus!(Fields!T);
enum canDBus = allCanDBus!(AllowedFieldTypes!T);
} else {
enum canDBus = false;
}
@ -147,7 +147,7 @@ string typeSig(T)() if(canDBus!T) {
return "a{" ~ typeSig!(KeyType!T) ~ typeSig!(ValueType!T) ~ "}";
} else static if(is(T == struct)) {
string sig = "(";
foreach(i, S; Fields!T) {
foreach(i, S; AllowedFieldTypes!T) {
sig ~= typeSig!S();
}
sig ~= ")";
@ -241,3 +241,11 @@ unittest {
sig3.assertEqual("iss");
}
private template AllowedFieldTypes(S) if (is(S == struct)) {
import ddbus.attributes : isAllowedField;
import std.meta : Filter, staticMap;
static alias TypeOf(alias sym) = typeof(sym);
alias AllowedFieldTypes =
staticMap!(TypeOf, Filter!(isAllowedField, S.tupleof));
}