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

Merge pull request #5550 from JackStouffer/DateTime-fromstring

Browse source 
Optimized std.datetime.date.DateTime from string methods
merged-on-behalf-of: Jonathan M Davis <jmdavis@users.noreply.github.com>
This commit is contained in:
The Dlang Bot 2017-07-08 07:42:20 +02:00 • committed by GitHub
commit 24e2f9e6e7
1 changed files with 15 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

33
std/datetime/date.d
View file

@ -3082,20 +3082,19 @@ public:
if (isSomeString!S)
{
import std.algorithm.searching : countUntil;
import std.conv : to;
import std.exception : enforce;
import std.format : format;
import std.string : strip;
immutable dstr = to!dstring(strip(isoString));
immutable str = strip(isoString);
enforce(dstr.length >= 15, new DateTimeException(format("Invalid ISO String: %s", isoString)));
auto t = dstr.countUntil('T');
enforce(str.length >= 15, new DateTimeException(format("Invalid ISO String: %s", isoString)));
auto t = str.countUntil('T');
enforce(t != -1, new DateTimeException(format("Invalid ISO String: %s", isoString)));
immutable date = Date.fromISOString(dstr[0 .. t]);
immutable tod = TimeOfDay.fromISOString(dstr[t+1 .. $]);
immutable date = Date.fromISOString(str[0 .. t]);
immutable tod = TimeOfDay.fromISOString(str[t+1 .. $]);
return DateTime(date, tod);
}
@ -3171,20 +3170,19 @@ public:
if (isSomeString!(S))
{
import std.algorithm.searching : countUntil;
import std.conv : to;
import std.exception : enforce;
import std.format : format;
import std.string : strip;
immutable dstr = to!dstring(strip(isoExtString));
immutable str = strip(isoExtString);
enforce(dstr.length >= 15, new DateTimeException(format("Invalid ISO Extended String: %s", isoExtString)));
auto t = dstr.countUntil('T');
enforce(str.length >= 15, new DateTimeException(format("Invalid ISO Extended String: %s", isoExtString)));
auto t = str.countUntil('T');
enforce(t != -1, new DateTimeException(format("Invalid ISO Extended String: %s", isoExtString)));
immutable date = Date.fromISOExtString(dstr[0 .. t]);
immutable tod = TimeOfDay.fromISOExtString(dstr[t+1 .. $]);
immutable date = Date.fromISOExtString(str[0 .. t]);
immutable tod = TimeOfDay.fromISOExtString(str[t+1 .. $]);
return DateTime(date, tod);
}
@ -3259,20 +3257,19 @@ public:
if (isSomeString!(S))
{
import std.algorithm.searching : countUntil;
import std.conv : to;
import std.exception : enforce;
import std.format : format;
import std.string : strip;
immutable dstr = to!dstring(strip(simpleString));
immutable str = strip(simpleString);
enforce(dstr.length >= 15, new DateTimeException(format("Invalid string format: %s", simpleString)));
auto t = dstr.countUntil(' ');
enforce(str.length >= 15, new DateTimeException(format("Invalid string format: %s", simpleString)));
auto t = str.countUntil(' ');
enforce(t != -1, new DateTimeException(format("Invalid string format: %s", simpleString)));
immutable date = Date.fromSimpleString(dstr[0 .. t]);
immutable tod = TimeOfDay.fromISOExtString(dstr[t+1 .. $]);
immutable date = Date.fromSimpleString(str[0 .. t]);
immutable tod = TimeOfDay.fromISOExtString(str[t+1 .. $]);
return DateTime(date, tod);
}