mirrors/Odin
1
0
Fork 0
mirror of https://github.com/odin-lang/Odin.git synced 2026-06-04 09:44:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4505 from colrdavidson/tzone_fix

Browse Source 
Parsing fix for timezones that have an uneven number of utc / st tags
This commit is contained in:
gingerBill
2024-11-21 15:30:17 +00:00
committed by GitHub
parent 3229f4668d f8586d0051
commit a88ac1d210
2 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
core/time/timezone/tzif.odin
View File

@@ -536,24 +536,21 @@ parse_tzif :: proc(_buffer: []u8, region_name: string, allocator := context.allo
buffer = buffer[(int(real_hdr.leapcnt) * size_of(Leapsecond_Record)):]
standard_wall_tags := buffer[:int(real_hdr.isstdcnt)]
buffer = buffer[int(real_hdr.isstdcnt):]
ut_tags := buffer[:int(real_hdr.isutcnt)]
for stdwall_tag, idx in standard_wall_tags {
ut_tag := ut_tags[idx]
for stdwall_tag, _ in standard_wall_tags {
if (stdwall_tag != 0 && stdwall_tag != 1) {
return
}
}
buffer = buffer[int(real_hdr.isstdcnt):]
ut_tags := buffer[:int(real_hdr.isutcnt)]
for ut_tag, _ in ut_tags {
if (ut_tag != 0 && ut_tag != 1) {
return
}
if ut_tag == 1 && stdwall_tag != 1 {
return
}
}
buffer = buffer[int(real_hdr.isutcnt):]
// Start of footer

10
tests/core/time/test_core_time.odin
View File

@@ -574,4 +574,14 @@ test_check_timezone_edgecases :: proc(t: ^testing.T) {
expected_tok_dt, _ := dt.components_to_datetime(2024, 10, 4, 9, 47, 0)
testing.expectf(t, datetime_eq(ret_dt, expected_tok_dt), "Failed to convert to Tokyo time")
tog_tz, tog_load_ok := tz.region_load("Pacific/Tongatapu")
testing.expectf(t, tog_load_ok, "Failed to load Pacific/Tongatapu timezone")
defer tz.region_destroy(tog_tz)
ret_dt = tz.datetime_to_tz(utc_dt, tog_tz)
expected_tog_dt, _ := dt.components_to_datetime(2024, 10, 4, 13, 47, 0)
testing.expectf(t, datetime_eq(ret_dt, expected_tog_dt), "Failed to convert to Togatapu time")
}