mirror/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00
Code Issues Projects Releases Wiki Activity

time: move - operator to operator.v (#7433)

Browse Source
This commit is contained in:
zakuro 2020-12-21 17:28:00 +09:00 committed by GitHub
parent c69947160b
commit c639dd03d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 30 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
vlib/time/operator.v
View File

@ -44,3 +44,11 @@ pub fn (t1 Time) gt(t2 Time) bool {
pub fn (t1 Time) ge(t2 Time) bool {
return t1.gt(t2) || t1.eq(t2)
}
// Time subtract using eperator overloading
[inline]
pub fn (lhs Time) -(rhs Time) Duration {
lhs_micro := lhs.unix * 1000 * 1000 + u64(lhs.microsecond)
rhs_micro := rhs.unix * 1000 * 1000 + u64(rhs.microsecond)
return (i64(lhs_micro) - i64(rhs_micro)) * microsecond
}

22
vlib/time/operator_test.v
View File

@ -367,3 +367,25 @@ fn test_time2_copied_from_time1_should_be_equal() {
t2 := new_time(t1)
assert t2.eq(t1)
}
fn test_subtract() {
d_seconds := 3
d_microseconds := 13
duration := d_seconds * second + d_microseconds * microsecond
t1 := new_time(Time{
year: 2000
month: 5
day: 10
hour: 22
minute: 11
second: 3
microsecond: 100
})
t2 := unix2(int(t1.unix) + d_seconds, t1.microsecond + d_microseconds)
d1 := t2 - t1
d2 := t1 - t2
assert d1 > 0
assert d1 == duration
assert d2 < 0
assert d2 == -duration
}

7
vlib/time/time.v
View File

@ -355,13 +355,6 @@ pub fn (t Time) str() string {
return t.format_ss()
}
// Time subtract using eperator overloading
pub fn (lhs Time) -(rhs Time) Duration {
lhs_micro := lhs.unix * 1000 * 1000 + u64(lhs.microsecond)
rhs_micro := rhs.unix * 1000 * 1000 + u64(rhs.microsecond)
return (i64(lhs_micro) - i64(rhs_micro)) * microsecond
}
fn convert_ctime(t C.tm, microsecond int) Time {
return Time{
year: t.tm_year + 1900

14
vlib/time/time_test.v
View File

@ -177,20 +177,6 @@ fn test_str() {
assert '1980-07-11 21:23:42' == time_to_test.str()
}
fn test_subtract() {
d_seconds := 3
d_microseconds := 13
duration := d_seconds * time.second + d_microseconds * time.microsecond
t1 := time_to_test
t2 := time.unix2(int(t1.unix) + d_seconds, t1.microsecond + d_microseconds)
d1 := t2 - t1
d2 := t1 - t2
assert d1 > 0
assert d1 == duration
assert d2 < 0
assert d2 == -duration
}
// not optimal test but will find obvious bugs
fn test_now() {
now := time.now()