Skip to content

Dramatically faster to import std.datetime (and anything under it) #5948

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
Dec 26, 2017
Merged

Dramatically faster to import std.datetime (and anything under it) #5948

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
32 changes: 28 additions & 4 deletions std/datetime/date.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,14 @@
+/
module std.datetime.date;

import core.time;
// Note: reconsider using specific imports below after
// https://issues.dlang.org/show_bug.cgi?id=17630 has been fixed
import core.time;// : TimeException;
import std.traits : isSomeString, Unqual;
import std.typecons : Flag;

version(unittest) import std.exception : assertThrown;


@safe unittest
{
initializeTests();
Expand Down Expand Up @@ -2064,6 +2065,7 @@ public:
}


import core.time : Duration;
/++
Gives the result of adding or subtracting a $(REF Duration, core,time)
from this $(LREF DateTime).
Expand Down Expand Up @@ -2108,6 +2110,8 @@ public:

@safe unittest
{
import core.time : dur;

auto dt = DateTime(Date(1999, 7, 6), TimeOfDay(12, 30, 33));

assert(dt + dur!"weeks"(7) == DateTime(Date(1999, 8, 24), TimeOfDay(12, 30, 33)));
Expand Down Expand Up @@ -2155,6 +2159,7 @@ public:
assert(idt - duration == DateTime(1999, 7, 6, 12, 30, 21));
}

import core.time : TickDuration;
// Explicitly undocumented. It will be removed in January 2018. @@@DEPRECATED_2018-01@@@
deprecated("Use Duration instead of TickDuration.")
DateTime opBinary(string op)(in TickDuration td) const @safe pure nothrow @nogc
Expand Down Expand Up @@ -2213,11 +2218,13 @@ public:
else static if (is(Unqual!D == TickDuration))
immutable hnsecs = duration.hnsecs;

import core.time : convert;
mixin(format(`return _addSeconds(convert!("hnsecs", "seconds")(%shnsecs));`, op));
}

@safe unittest
{
import core.time : dur;
assert(DateTime(Date(1999, 7, 6), TimeOfDay(12, 30, 33)) + dur!"weeks"(7) ==
DateTime(Date(1999, 8, 24), TimeOfDay(12, 30, 33)));
assert(DateTime(Date(1999, 7, 6), TimeOfDay(12, 30, 33)) + dur!"weeks"(-7) ==
Expand Down Expand Up @@ -2357,13 +2364,15 @@ public:
immutable dateResult = _date - rhs.date;
immutable todResult = _tod - rhs._tod;

import core.time : dur;
return dur!"hnsecs"(dateResult.total!"hnsecs" + todResult.total!"hnsecs");
}

@safe unittest
{
auto dt = DateTime(1999, 7, 6, 12, 30, 33);

import core.time : dur;
assert(DateTime(Date(1999, 7, 6), TimeOfDay(12, 30, 33)) - DateTime(Date(1998, 7, 6), TimeOfDay(12, 30, 33)) ==
dur!"seconds"(31_536_000));
assert(DateTime(Date(1998, 7, 6), TimeOfDay(12, 30, 33)) - DateTime(Date(1999, 7, 6), TimeOfDay(12, 30, 33)) ==
Expand Down Expand Up @@ -3458,6 +3467,7 @@ private:
+/
ref DateTime _addSeconds(long seconds) return @safe pure nothrow @nogc
{
import core.time : convert;
long hnsecs = convert!("seconds", "hnsecs")(seconds);
hnsecs += convert!("hours", "hnsecs")(_tod._hour);
hnsecs += convert!("minutes", "hnsecs")(_tod._minute);
Expand Down Expand Up @@ -6040,7 +6050,7 @@ public:
static assert(!__traits(compiles, idate.roll!"days"(12)));
}


import core.time : Duration;
/++
Gives the result of adding or subtracting a $(REF Duration, core,time)
from
Expand Down Expand Up @@ -6080,6 +6090,7 @@ public:
{
auto date = Date(1999, 7, 6);

import core.time : dur;
assert(date + dur!"weeks"(7) == Date(1999, 8, 24));
assert(date + dur!"weeks"(-7) == Date(1999, 5, 18));
assert(date + dur!"days"(7) == Date(1999, 7, 13));
Expand Down Expand Up @@ -6128,12 +6139,14 @@ public:
assert(idate - duration == Date(1999, 6, 24));
}

import core.time : TickDuration;
// Explicitly undocumented. It will be removed in January 2018. @@@DEPRECATED_2018-01@@@
deprecated("Use Duration instead of TickDuration.")
Date opBinary(string op)(TickDuration td) const @safe pure nothrow @nogc
if (op == "+" || op == "-")
{
Date retval = this;
import core.time : convert;
immutable days = convert!("hnsecs", "days")(td.hnsecs);
mixin("return retval._addDays(" ~ op ~ "days);");
}
Expand Down Expand Up @@ -6180,6 +6193,7 @@ public:

@safe unittest
{
import core.time : dur;
assert(Date(1999, 7, 6) + dur!"weeks"(7) == Date(1999, 8, 24));
assert(Date(1999, 7, 6) + dur!"weeks"(-7) == Date(1999, 5, 18));
assert(Date(1999, 7, 6) + dur!"days"(7) == Date(1999, 7, 13));
Expand Down Expand Up @@ -6240,6 +6254,7 @@ public:
ref Date opOpAssign(string op)(TickDuration td) @safe pure nothrow @nogc
if (op == "+" || op == "-")
{
import core.time : convert;
immutable days = convert!("seconds", "days")(td.seconds);
mixin("return _addDays(" ~ op ~ "days);");
}
Expand Down Expand Up @@ -6276,7 +6291,6 @@ public:
}
}


/++
Gives the difference between two $(LREF Date)s.

Expand All @@ -6289,13 +6303,15 @@ public:
Duration opBinary(string op)(in Date rhs) const @safe pure nothrow @nogc
if (op == "-")
{
import core.time : dur;
return dur!"days"(this.dayOfGregorianCal - rhs.dayOfGregorianCal);
}

@safe unittest
{
auto date = Date(1999, 7, 6);

import core.time : dur;
assert(Date(1999, 7, 6) - Date(1998, 7, 6) == dur!"days"(365));
assert(Date(1998, 7, 6) - Date(1999, 7, 6) == dur!"days"(-365));
assert(Date(1999, 6, 6) - Date(1999, 5, 6) == dur!"days"(31));
Expand Down Expand Up @@ -8353,6 +8369,7 @@ public:
ref TimeOfDay roll(string units)(long value) @safe pure nothrow @nogc
if (units == "hours")
{
import core.time : dur;
return this += dur!"hours"(value);
}

Expand Down Expand Up @@ -8577,6 +8594,7 @@ public:
}


import core.time : Duration;
/++
Gives the result of adding or subtracting a $(REF Duration, core,time)
from this $(LREF TimeOfDay).
Expand Down Expand Up @@ -8621,6 +8639,7 @@ public:
{
auto tod = TimeOfDay(12, 30, 33);

import core.time : dur;
assert(tod + dur!"hours"(7) == TimeOfDay(19, 30, 33));
assert(tod + dur!"hours"(-7) == TimeOfDay(5, 30, 33));
assert(tod + dur!"minutes"(7) == TimeOfDay(12, 37, 33));
Expand Down Expand Up @@ -8661,6 +8680,7 @@ public:
assert(itod - duration == TimeOfDay(1, 30, 33));
}

import core.time : TickDuration;
// Explicitly undocumented. It will be removed in January 2018. @@@DEPRECATED_2018-01@@@
deprecated("Use Duration instead of TickDuration.")
TimeOfDay opBinary(string op)(TickDuration td) const @safe pure nothrow @nogc
Expand Down Expand Up @@ -8714,6 +8734,7 @@ public:

@safe unittest
{
import core.time : dur;
auto duration = dur!"hours"(12);

assert(TimeOfDay(12, 30, 33) + dur!"hours"(7) == TimeOfDay(19, 30, 33));
Expand Down Expand Up @@ -8817,13 +8838,15 @@ public:
immutable lhsSec = _hour * 3600 + _minute * 60 + _second;
immutable rhsSec = rhs._hour * 3600 + rhs._minute * 60 + rhs._second;

import core.time : dur;
return dur!"seconds"(lhsSec - rhsSec);
}

@safe unittest
{
auto tod = TimeOfDay(12, 30, 33);

import core.time : dur;
assert(TimeOfDay(7, 12, 52) - TimeOfDay(12, 30, 33) == dur!"seconds"(-19_061));
assert(TimeOfDay(12, 30, 33) - TimeOfDay(7, 12, 52) == dur!"seconds"(19_061));
assert(TimeOfDay(12, 30, 33) - TimeOfDay(14, 30, 33) == dur!"seconds"(-7200));
Expand Down Expand Up @@ -9253,6 +9276,7 @@ private:
+/
ref TimeOfDay _addSeconds(long seconds) return @safe pure nothrow @nogc
{
import core.time : convert;
long hnsecs = convert!("seconds", "hnsecs")(seconds);
hnsecs += convert!("hours", "hnsecs")(_hour);
hnsecs += convert!("minutes", "hnsecs")(_minute);
Expand Down
Loading