ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-06 15:48:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ensmallen Date struct.

Browse Source
This commit is contained in:
Jeroen van Rijn
2024-03-20 18:13:29 +01:00
parent 89ca15014c
commit ed5fd15f6e
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/time/datetime/constants.odin
+2 -2
View File
@@ -26,8 +26,8 @@ Error :: enum {
Date :: struct { Date :: struct {
year: i64, year: i64,
month: i64, month: i8,
day: i64, day: i8,
} }
Time :: struct { Time :: struct {
core/time/datetime/datetime.odin
+7 -7
View File
@@ -15,7 +15,7 @@ date_to_ordinal :: proc "contextless" (date: Date) -> (ordinal: Ordinal, err: Er
} }
components_to_ordinal :: proc "contextless" (#any_int year, #any_int month, #any_int day: i64) -> (ordinal: Ordinal, err: Error) { components_to_ordinal :: proc "contextless" (#any_int year, #any_int month, #any_int day: i64) -> (ordinal: Ordinal, err: Error) {
return date_to_ordinal(Date{year, month, day}) return date_to_ordinal(Date{year, i8(month), i8(day)})
} }
// Procedures that return a Date // Procedures that return a Date
@@ -26,7 +26,7 @@ ordinal_to_date :: proc "contextless" (ordinal: Ordinal) -> (date: Date, err: Er
} }
components_to_date :: proc "contextless" (#any_int year, #any_int month, #any_int day: i64) -> (date: Date, err: Error) { components_to_date :: proc "contextless" (#any_int year, #any_int month, #any_int day: i64) -> (date: Date, err: Error) {
date = Date{i64(year), i64(month), i64(day)} date = Date{i64(year), i8(month), i8(day)}
validate(date) or_return validate(date) or_return
return date, .None return date, .None
} }
@@ -128,7 +128,7 @@ days_remaining :: proc "contextless" (date: Date) -> (days_remaining: i64, err:
return delta.days, .None return delta.days, .None
} }
last_day_of_month :: proc "contextless" (year, month: i64) -> (day: i64, err: Error) { last_day_of_month :: proc "contextless" (#any_int year: i64, #any_int month: i8) -> (day: i64, err: Error) {
// Not using formula 2.27 from the book. This is far simpler and gives the same answer. // Not using formula 2.27 from the book. This is far simpler and gives the same answer.
validate(Date{year, month, 1}) or_return validate(Date{year, month, 1}) or_return
@@ -210,7 +210,7 @@ unsafe_date_to_ordinal :: proc "contextless" (date: Date) -> (ordinal: Ordinal)
ordinal += floor_div(year_minus_one, 4) // Julian-rule leap days ordinal += floor_div(year_minus_one, 4) // Julian-rule leap days
ordinal -= floor_div(year_minus_one, 100) // Prior century years ordinal -= floor_div(year_minus_one, 100) // Prior century years
ordinal += floor_div(year_minus_one, 400) // Prior 400-multiple years ordinal += floor_div(year_minus_one, 400) // Prior 400-multiple years
ordinal += floor_div(367 * date.month - 362, 12) // Prior days this year ordinal += floor_div(367 * i64(date.month) - 362, 12) // Prior days this year
// Apply correction // Apply correction
if date.month <= 2 { if date.month <= 2 {
@@ -222,7 +222,7 @@ unsafe_date_to_ordinal :: proc "contextless" (date: Date) -> (ordinal: Ordinal)
} }
// Add days // Add days
ordinal += date.day ordinal += i64(date.day)
return return
} }
@@ -268,8 +268,8 @@ unsafe_ordinal_to_date :: proc "contextless" (ordinal: Ordinal) -> (date: Date)
correction = 1 correction = 1
} }
month := floor_div((12 * (prior_days + correction) + 373), 367) month := i8(floor_div((12 * (prior_days + correction) + 373), 367))
day := ordinal - unsafe_date_to_ordinal(Date{year, month, 1}) + 1 day := i8(ordinal - unsafe_date_to_ordinal(Date{year, month, 1}) + 1)
return {year, month, day} return {year, month, day}
} }
tests/core/time/test_core_time.odin
+2 -2
View File
@@ -172,7 +172,7 @@ date_component_roundtrip_test :: proc(t: ^testing.T, moment: dt.DateTime) {
expected := fmt.tprintf("Expected %4d-%2d-%2d %2d:%2d:%2d, got %4d-%2d-%2d %2d:%2d:%2d", expected := fmt.tprintf("Expected %4d-%2d-%2d %2d:%2d:%2d, got %4d-%2d-%2d %2d:%2d:%2d",
moment.year, moment.month, moment.day, moment.hour, moment.minute, moment.second, YYYY, MM, DD, hh, mm, ss) moment.year, moment.month, moment.day, moment.hour, moment.minute, moment.second, YYYY, MM, DD, hh, mm, ss)
ok = moment.year == i64(YYYY) && moment.month == i64(MM) && moment.day == i64(DD) ok = moment.year == i64(YYYY) && moment.month == i8(MM) && moment.day == i8(DD)
ok &= moment.hour == i8(hh) && moment.minute == i8(mm) && moment.second == i8(ss) ok &= moment.hour == i8(hh) && moment.minute == i8(mm) && moment.second == i8(ss)
expect(t, ok, expected) expect(t, ok, expected)
} }