debian-packages/dyaml
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #38 from Herringway/master

Browse source 
use systime's duration overload instead of deprecated fracsec overload
This commit is contained in:
Ferdinand Majerech 2015-11-08 19:55:01 +01:00
parent 77f32a16ba af724ddcf4
commit 4c091cf5bb
2 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/dyaml/constructor.d
View file

@ -609,7 +609,7 @@ SysTime constructTimestamp(ref Node node)
{ {
// No timezone. // No timezone.
return SysTime(DateTime(year, month, day, hour, minute, second), return SysTime(DateTime(year, month, day, hour, minute, second),
FracSec.from!"hnsecs"(hectonanosecond), UTC()); hectonanosecond.dur!"hnsecs", UTC());
} }
// We have a timezone, so parse it. // We have a timezone, so parse it.
@ -625,7 +625,7 @@ SysTime constructTimestamp(ref Node node)
const tzOffset = dur!"minutes"(sign * (60 * tzHours + tzMinutes)); const tzOffset = dur!"minutes"(sign * (60 * tzHours + tzMinutes));
return SysTime(DateTime(year, month, day, hour, minute, second), return SysTime(DateTime(year, month, day, hour, minute, second),
FracSec.from!"hnsecs"(hectonanosecond), hectonanosecond.dur!"hnsecs",
new immutable SimpleTimeZone(tzOffset)); new immutable SimpleTimeZone(tzOffset));
} }
catch(ConvException e) catch(ConvException e)

18
source/dyaml/testconstructor.d
View file

@ -217,11 +217,10 @@ Node[] constructTimestamp()
{ {
alias DT = DateTime; alias DT = DateTime;
alias ST = SysTime; alias ST = SysTime;
alias hnsecs = FracSec.from!"hnsecs"; return [Node([pair("canonical", ST(DT(2001, 12, 15, 2, 59, 43), 1000000.dur!"hnsecs", UTC())),
return [Node([pair("canonical", ST(DT(2001, 12, 15, 2, 59, 43), hnsecs(1000000), UTC())), pair("valid iso8601", ST(DT(2001, 12, 15, 2, 59, 43), 1000000.dur!"hnsecs", UTC())),
pair("valid iso8601", ST(DT(2001, 12, 15, 2, 59, 43), hnsecs(1000000), UTC())), pair("space separated", ST(DT(2001, 12, 15, 2, 59, 43), 1000000.dur!"hnsecs", UTC())),
pair("space separated", ST(DT(2001, 12, 15, 2, 59, 43), hnsecs(1000000), UTC())), pair("no time zone (Z)", ST(DT(2001, 12, 15, 2, 59, 43), 1000000.dur!"hnsecs", UTC())),
pair("no time zone (Z)", ST(DT(2001, 12, 15, 2, 59, 43), hnsecs(1000000), UTC())),
pair("date (00:00:00Z)", ST(DT(2002, 12, 14), UTC()))])]; pair("date (00:00:00Z)", ST(DT(2002, 12, 14), UTC()))])];
} }
@ -281,14 +280,13 @@ Node[] timestampBugs()
{ {
alias DT = DateTime; alias DT = DateTime;
alias ST = SysTime; alias ST = SysTime;
alias hnsecs = FracSec.from!"hnsecs";
alias STZ = immutable SimpleTimeZone; alias STZ = immutable SimpleTimeZone;
return [Node([Node(ST(DT(2001, 12, 15, 3, 29, 43), hnsecs(1000000), UTC())), return [Node([Node(ST(DT(2001, 12, 15, 3, 29, 43), 1000000.dur!"hnsecs", UTC())),
Node(ST(DT(2001, 12, 14, 16, 29, 43), hnsecs(1000000), UTC())), Node(ST(DT(2001, 12, 14, 16, 29, 43), 1000000.dur!"hnsecs", UTC())),
Node(ST(DT(2001, 12, 14, 21, 59, 43), hnsecs(10100), UTC())), Node(ST(DT(2001, 12, 14, 21, 59, 43), 10100.dur!"hnsecs", UTC())),
Node(ST(DT(2001, 12, 14, 21, 59, 43), new STZ(60.dur!"minutes"))), Node(ST(DT(2001, 12, 14, 21, 59, 43), new STZ(60.dur!"minutes"))),
Node(ST(DT(2001, 12, 14, 21, 59, 43), new STZ(-90.dur!"minutes"))), Node(ST(DT(2001, 12, 14, 21, 59, 43), new STZ(-90.dur!"minutes"))),
Node(ST(DT(2005, 7, 8, 17, 35, 4), hnsecs(5176000), UTC()))])]; Node(ST(DT(2005, 7, 8, 17, 35, 4), 5176000.dur!"hnsecs", UTC()))])];
} }
Node[] utf16be() Node[] utf16be()