Skip to content

Fix issue 17801: DateTime.fromISOExtString no longer works with const strings. #5721

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
Sep 5, 2017
Merged

Fix issue 17801: DateTime.fromISOExtString no longer works with const strings. #5721

Show file tree
Hide file tree
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
102 changes: 99 additions & 3 deletions std/datetime/date.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3106,7 +3106,7 @@ public:
import std.format : format;
import std.string : strip;

immutable str = strip(isoString);
auto str = strip(isoString);

enforce(str.length >= 15, new DateTimeException(format("Invalid ISO String: %s", isoString)));
auto t = str.countUntil('T');
Expand Down Expand Up @@ -3172,6 +3172,18 @@ public:
assert(DateTime.fromISOString(" 19990706T123033 ") == DateTime(Date(1999, 7, 6), TimeOfDay(12, 30, 33)));
}

// bug# 17801
@safe unittest
{
import std.conv : to;
import std.meta : AliasSeq;
foreach (C; AliasSeq!(char, wchar, dchar))
{
foreach (S; AliasSeq!(C[], const(C)[], immutable(C)[]))
assert(DateTime.fromISOString(to!S("20121221T141516")) == DateTime(2012, 12, 21, 14, 15, 16));
}
}


/++
Creates a $(LREF DateTime) from a string with the format
Expand All @@ -3194,7 +3206,7 @@ public:
import std.format : format;
import std.string : strip;

immutable str = strip(isoExtString);
auto str = strip(isoExtString);

enforce(str.length >= 15, new DateTimeException(format("Invalid ISO Extended String: %s", isoExtString)));
auto t = str.countUntil('T');
Expand Down Expand Up @@ -3259,6 +3271,18 @@ public:
assert(DateTime.fromISOExtString(" 1999-07-06T12:30:33 ") == DateTime(Date(1999, 7, 6), TimeOfDay(12, 30, 33)));
}

// bug# 17801
@safe unittest
{
import std.conv : to;
import std.meta : AliasSeq;
foreach (C; AliasSeq!(char, wchar, dchar))
{
foreach (S; AliasSeq!(C[], const(C)[], immutable(C)[]))
assert(DateTime.fromISOExtString(to!S("2012-12-21T14:15:16")) == DateTime(2012, 12, 21, 14, 15, 16));
}
}


/++
Creates a $(LREF DateTime) from a string with the format
Expand All @@ -3281,7 +3305,7 @@ public:
import std.format : format;
import std.string : strip;

immutable str = strip(simpleString);
auto str = strip(simpleString);

enforce(str.length >= 15, new DateTimeException(format("Invalid string format: %s", simpleString)));
auto t = str.countUntil(' ');
Expand Down Expand Up @@ -3350,6 +3374,18 @@ public:
DateTime(Date(1999, 7, 6), TimeOfDay(12, 30, 33)));
}

// bug# 17801
@safe unittest
{
import std.conv : to;
import std.meta : AliasSeq;
foreach (C; AliasSeq!(char, wchar, dchar))
{
foreach (S; AliasSeq!(C[], const(C)[], immutable(C)[]))
assert(DateTime.fromSimpleString(to!S("2012-Dec-21 14:15:16")) == DateTime(2012, 12, 21, 14, 15, 16));
}
}


/++
Returns the $(LREF DateTime) farthest in the past which is representable
Expand Down Expand Up @@ -7467,6 +7503,18 @@ public:
assert(Date.fromISOString(" 19990706 ") == Date(1999, 7, 6));
}

// bug# 17801
@safe unittest
{
import std.conv : to;
import std.meta : AliasSeq;
foreach (C; AliasSeq!(char, wchar, dchar))
{
foreach (S; AliasSeq!(C[], const(C)[], immutable(C)[]))
assert(Date.fromISOString(to!S("20121221")) == Date(2012, 12, 21));
}
}


/++
Creates a $(LREF Date) from a string with the format YYYY-MM-DD.
Expand Down Expand Up @@ -7596,6 +7644,18 @@ public:
assert(Date.fromISOExtString(" 1999-07-06 ") == Date(1999, 7, 6));
}

// bug# 17801
@safe unittest
{
import std.conv : to;
import std.meta : AliasSeq;
foreach (C; AliasSeq!(char, wchar, dchar))
{
foreach (S; AliasSeq!(C[], const(C)[], immutable(C)[]))
assert(Date.fromISOExtString(to!S("2012-12-21")) == Date(2012, 12, 21));
}
}


/++
Creates a $(LREF Date) from a string with the format YYYY-Mon-DD.
Expand Down Expand Up @@ -7722,6 +7782,18 @@ public:
assert(Date.fromSimpleString(" 1999-Jul-06 ") == Date(1999, 7, 6));
}

// bug# 17801
@safe unittest
{
import std.conv : to;
import std.meta : AliasSeq;
foreach (C; AliasSeq!(char, wchar, dchar))
{
foreach (S; AliasSeq!(C[], const(C)[], immutable(C)[]))
assert(Date.fromSimpleString(to!S("2012-Dec-21")) == Date(2012, 12, 21));
}
}


/++
Returns the $(LREF Date) farthest in the past which is representable by
Expand Down Expand Up @@ -8986,6 +9058,18 @@ public:
assert(TimeOfDay.fromISOString(" 011217 ") == TimeOfDay(1, 12, 17));
}

// bug# 17801
@safe unittest
{
import std.conv : to;
import std.meta : AliasSeq;
foreach (C; AliasSeq!(char, wchar, dchar))
{
foreach (S; AliasSeq!(C[], const(C)[], immutable(C)[]))
assert(TimeOfDay.fromISOString(to!S("141516")) == TimeOfDay(14, 15, 16));
}
}


/++
Creates a $(LREF TimeOfDay) from a string with the format HH:MM:SS.
Expand Down Expand Up @@ -9101,6 +9185,18 @@ public:
assert(TimeOfDay.fromISOExtString(" 01:12:17 ") == TimeOfDay(1, 12, 17));
}

// bug# 17801
@safe unittest
{
import std.conv : to;
import std.meta : AliasSeq;
foreach (C; AliasSeq!(char, wchar, dchar))
{
foreach (S; AliasSeq!(C[], const(C)[], immutable(C)[]))
assert(TimeOfDay.fromISOExtString(to!S("14:15:16")) == TimeOfDay(14, 15, 16));
}
}


/++
Returns midnight.
Expand Down
45 changes: 45 additions & 0 deletions std/datetime/systime.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8480,6 +8480,21 @@ public:
test("20101222T172201.45+08:00", SysTime(DateTime(2010, 12, 22, 17, 22, 01), hnsecs(4_500_000), east480));
}

// bug# 17801
@safe unittest
{
import std.conv : to;
import std.meta : AliasSeq;
foreach (C; AliasSeq!(char, wchar, dchar))
{
foreach (S; AliasSeq!(C[], const(C)[], immutable(C)[]))
{
assert(SysTime.fromISOString(to!S("20121221T141516Z")) ==
SysTime(DateTime(2012, 12, 21, 14, 15, 16), UTC()));
}
}
}


/++
Creates a $(LREF SysTime) from a string with the format
Expand Down Expand Up @@ -8706,6 +8721,21 @@ public:
test("2010-12-22T17:22:01.45+08:00", SysTime(DateTime(2010, 12, 22, 17, 22, 01), hnsecs(4_500_000), east480));
}

// bug# 17801
@safe unittest
{
import std.conv : to;
import std.meta : AliasSeq;
foreach (C; AliasSeq!(char, wchar, dchar))
{
foreach (S; AliasSeq!(C[], const(C)[], immutable(C)[]))
{
assert(SysTime.fromISOExtString(to!S("2012-12-21T14:15:16Z")) ==
SysTime(DateTime(2012, 12, 21, 14, 15, 16), UTC()));
}
}
}


/++
Creates a $(LREF SysTime) from a string with the format
Expand Down Expand Up @@ -8935,6 +8965,21 @@ public:
test("2010-Dec-22 17:22:01.45+08:00", SysTime(DateTime(2010, 12, 22, 17, 22, 01), hnsecs(4_500_000), east480));
}

// bug# 17801
@safe unittest
{
import std.conv : to;
import std.meta : AliasSeq;
foreach (C; AliasSeq!(char, wchar, dchar))
{
foreach (S; AliasSeq!(C[], const(C)[], immutable(C)[]))
{
assert(SysTime.fromSimpleString(to!S("2012-Dec-21 14:15:16Z")) ==
SysTime(DateTime(2012, 12, 21, 14, 15, 16), UTC()));
}
}
}


/++
Returns the $(LREF SysTime) farthest in the past which is representable
Expand Down