OSS
/
tanya
1
0
Fork 0
Code Issues 1 Pull Requests Releases Activity

Fix formatting null class references

This commit is contained in:
Eugen Wissner 2017-12-16 09:42:57 +01:00
parent 78a8afdf75
commit 12de700706
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
source/tanya/format/package.d
View File

@ -742,19 +742,13 @@ private ref String printToString(string fmt, Args...)(return ref String result,
{ {
result.insertBack(args[0] ? "true" : "false"); result.insertBack(args[0] ? "true" : "false");
} }
else static if (isSomeString!Arg) // String else static if (isSomeChar!Arg || isSomeString!Arg) // String or char
{ {
if (args[0] is null) result.insertBack(args[0]);
{
result.insertBack("null");
}
else
{
result.insertBack(args[0]);
}
} }
else static if (isSomeChar!Arg // Supported by String.insertBack() else static if (isInputRange!Arg
|| (isInputRange!Arg && isSomeChar!(ElementType!Arg))) && !isInfinite!Arg
&& isSomeChar!(ElementType!Arg)) // Stringish range
{ {
result.insertBack(args[0]); result.insertBack(args[0]);
} }
@ -764,7 +758,7 @@ private ref String printToString(string fmt, Args...)(return ref String result,
} }
else static if (is(Arg == class)) else static if (is(Arg == class))
{ {
result.insertBack(args[0].toString()); result.insertBack(args[0] is null ? "null" : args[0].toString());
} }
else static if (is(Arg == interface)) else static if (is(Arg == interface))
{ {
@ -804,7 +798,8 @@ private ref String printToString(string fmt, Args...)(return ref String result,
} }
else else
{ {
result.insertBack(Arg.stringof); static assert(false,
"Formatting type " ~ Arg.stringof ~ " is not supported");
} }
return result; return result;
@ -830,7 +825,7 @@ package(tanya) String format(string fmt, Args...)(auto ref Args args)
// String printing. // String printing.
assert(format!"{}"("Some weired string") == "Some weired string"); assert(format!"{}"("Some weired string") == "Some weired string");
assert(format!"{}"(cast(string) null) == "null"); assert(format!"{}"(cast(string) null) == "");
assert(format!"{}"('c') == "c"); assert(format!"{}"('c') == "c");
// Integer. // Integer.
@ -943,6 +938,7 @@ package(tanya) String format(string fmt, Args...)(auto ref Args args)
auto instance = defaultAllocator.unique!A(); auto instance = defaultAllocator.unique!A();
assert(format!"{}"(instance.get()) == instance.get.toString()); assert(format!"{}"(instance.get()) == instance.get.toString());
assert(format!"{}"(cast(I) instance.get()) == I.classinfo.name); assert(format!"{}"(cast(I) instance.get()) == I.classinfo.name);
assert(format!"{}"(cast(A) null) == "null");
} }
// Ranges. // Ranges.