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

Merge pull request #56 from drug007/patch-1

Browse source 
`TaggedUnion.toString` supports @safe
This commit is contained in:
Sönke Ludwig 2020-05-12 12:15:22 +02:00 committed by GitHub
parent 6ed851b336 c30b17f3f4
commit a265d75bad
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
source/taggedalgebraic/taggedunion.d
View file

@ -325,11 +325,6 @@ align(commonAlignment!(UnionKindTypes!(UnionFieldEnum!U))) struct TaggedUnion
if (isOutputRange!(W, char))
{
import std.range.primitives : put;
toString(s => put(w, s));
}
/// ditto
void toString(scope void delegate(const(char)[]) sink)
const {
import std.conv : text;
import std.format : FormatSpec, formatValue;
@ -337,24 +332,23 @@ align(commonAlignment!(UnionKindTypes!(UnionFieldEnum!U))) struct TaggedUnion
foreach (i, v; EnumMembers!Kind) {
case v:
enum vstr = text(v);
static if (isUnitType!(FieldTypes[i])) sink(vstr);
static if (isUnitType!(FieldTypes[i])) put(w, vstr);
else {
// NOTE: using formatValue instead of formattedWrite
// because formattedWrite does not work for
// non-copyable types
enum prefix = "(" ~ vstr ~ ": ";
enum suffix = ")";
sink(prefix);
put(w, prefix);
FormatSpec!char spec;
sink.formatValue(value!v, spec);
sink(suffix);
formatValue(w, value!v, spec);
put(w, suffix);
}
break;
}
}
}
package @trusted @property ref inout(T) trustedGet(T)() inout { return *cast(inout(T)*)m_data.ptr; }
}
}