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

Also use get in array conversion

Browse source
This commit is contained in:
Harry T. Vennik 2017-12-09 16:33:44 +01:00
parent 238db94916
commit 0841ac69de
1 changed files with 6 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
source/ddbus/thin.d
View file

@ -532,32 +532,22 @@ struct DBusAny {
alias E = Unqual!(ElementType!T);
if (typeSig == "ay") {
auto data = get!(const(ubyte)[]);
static if (is(E == ubyte) || is(E == byte)) {
return cast(T) binaryData.dup;
return cast(T) data.dup;
} else {
T ret;
ret.length = binaryData.length;
foreach (i, b; binaryData)
ret[i] = b;
return ret;
return cast(T) data.map!(elem => elem.to!E).array;
}
} else if (type == 'a' || (type == 'r' && is(E == DBusAny))) {
E[] ret;
ret.length = array.length;
foreach (i, elem; array)
ret[i] = elem.to!(ElementType!T);
return cast(T) ret;
return cast(T) get!(const(DBusAny)[]).map!(elem => elem.to!E).array;
}
} else static if (isTuple!T) {
if (type == 'r') {
T ret;
foreach (i, T; ret.Types)
foreach (i, T; ret.Types) {
ret[i] = tuple[i].to!T;
}
return ret;
}