Skip to content

Optimized std.datetime.date.TimeOfDay.fromISOString #5413

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dlang-bot merged 1 commit into from
May 26, 2017
Merged

Optimized std.datetime.date.TimeOfDay.fromISOString #5413

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 17 additions & 14 deletions std/datetime/date.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8790,26 +8790,29 @@ public:
static TimeOfDay fromISOString(S)(in S isoString) @safe pure
if (isSomeString!S)
{
import std.algorithm.searching : all;
import std.ascii : isDigit;
import std.conv : to;
import std.conv : to, text, ConvException;
import std.exception : enforce;
import std.format : format;
import std.string : strip;

auto dstr = to!dstring(strip(isoString));

enforce(dstr.length == 6, new DateTimeException(format("Invalid ISO String: %s", isoString)));
int hours, minutes, seconds;
auto str = strip(isoString);

auto hours = dstr[0 .. 2];
auto minutes = dstr[2 .. 4];
auto seconds = dstr[4 .. $];
enforce!DateTimeException(str.length == 6, text("Invalid ISO String: ", isoString));

enforce(all!isDigit(hours), new DateTimeException(format("Invalid ISO String: %s", isoString)));
enforce(all!isDigit(minutes), new DateTimeException(format("Invalid ISO String: %s", isoString)));
enforce(all!isDigit(seconds), new DateTimeException(format("Invalid ISO String: %s", isoString)));
try
{
// cast to int from uint is used because it checks for
// non digits without extra loops
hours = cast(int) to!uint(str[0 .. 2]);
minutes = cast(int) to!uint(str[2 .. 4]);
seconds = cast(int) to!uint(str[4 .. $]);
}
catch (ConvException)
{
throw new DateTimeException(text("Invalid ISO String: ", isoString));
}

return TimeOfDay(to!int(hours), to!int(minutes), to!int(seconds));
return TimeOfDay(hours, minutes, seconds);
}

///
Expand Down