mirrors/phobos
1
0
Fork 0
mirror of https://github.com/dlang/phobos.git synced 2025-04-27 13:40:20 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2265 from jmdavis/exception

Browse source 
Slight improvement to enforceEx's constraints and its documentation.
This commit is contained in:
David Nadlinger 2014-06-23 08:36:55 +02:00
commit fd67ac9fb2
1 changed files with 23 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

25
std/exception.d
View file

@ -537,9 +537,10 @@ T errnoEnforce(T, string file = __FILE__, size_t line = __LINE__)
enforceEx!DataCorruptionException(line.length); enforceEx!DataCorruptionException(line.length);
-------------------- --------------------
+/ +/
template enforceEx(E) template enforceEx(E : Throwable)
if (is(typeof(new E("", __FILE__, __LINE__)))) if (is(typeof(new E("", __FILE__, __LINE__))))
{ {
/++ Ditto +/
T enforceEx(T)(T value, lazy string msg = "", string file = __FILE__, size_t line = __LINE__) T enforceEx(T)(T value, lazy string msg = "", string file = __FILE__, size_t line = __LINE__)
{ {
if (!value) throw new E(msg, file, line); if (!value) throw new E(msg, file, line);
@ -547,9 +548,11 @@ template enforceEx(E)
} }
} }
template enforceEx(E) /++ Ditto +/
template enforceEx(E : Throwable)
if (is(typeof(new E(__FILE__, __LINE__))) && !is(typeof(new E("", __FILE__, __LINE__)))) if (is(typeof(new E(__FILE__, __LINE__))) && !is(typeof(new E("", __FILE__, __LINE__))))
{ {
/++ Ditto +/
T enforceEx(T)(T value, string file = __FILE__, size_t line = __LINE__) T enforceEx(T)(T value, string file = __FILE__, size_t line = __LINE__)
{ {
if (!value) throw new E(file, line); if (!value) throw new E(file, line);
@ -578,6 +581,24 @@ unittest
assert(e.file == "file"); assert(e.file == "file");
assert(e.line == 42); assert(e.line == 42);
} }
{
auto e = collectException!Error(enforceEx!OutOfMemoryError(false));
assert(e !is null);
assert(e.msg == "Memory allocation failed");
assert(e.file == __FILE__);
assert(e.line == __LINE__ - 4);
}
{
auto e = collectException!Error(enforceEx!OutOfMemoryError(false, "file", 42));
assert(e !is null);
assert(e.msg == "Memory allocation failed");
assert(e.file == "file");
assert(e.line == 42);
}
static assert(!is(typeof(enforceEx!int(true))));
} }
unittest unittest