mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-06 06:13:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

std.time.epoch: change getDaysInMonth to accept the year as an argument

Browse Source
This commit is contained in:
Jeremy Hertel 2024-09-01 20:07:15 -05:00 committed by Andrew Kelley
parent a5900e310e
commit 801a95035c
3 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/std/crypto/Certificate.zig
View File

@ -607,11 +607,10 @@ const Date = struct {
} }
{ {
const is_leap = std.time.epoch.isLeapYear(date.year);
var month: u4 = 1; var month: u4 = 1;
while (month < date.month) : (month += 1) { while (month < date.month) : (month += 1) {
const days: u64 = std.time.epoch.getDaysInMonth( const days: u64 = std.time.epoch.getDaysInMonth(
@as(std.time.epoch.YearLeapKind, @enumFromInt(@intFromBool(is_leap))), date.year,
@as(std.time.epoch.Month, @enumFromInt(month)), @as(std.time.epoch.Month, @enumFromInt(month)),
); );
sec += days * std.time.epoch.secs_per_day; sec += days * std.time.epoch.secs_per_day;

3
lib/std/os/uefi.zig
View File

@ -141,11 +141,10 @@ pub const Time = extern struct {
pub const unspecified_timezone: i16 = 0x7ff; pub const unspecified_timezone: i16 = 0x7ff;
fn daysInYear(year: u16, max_month: u4) u9 { fn daysInYear(year: u16, max_month: u4) u9 {
const leap_year: std.time.epoch.YearLeapKind = if (std.time.epoch.isLeapYear(year)) .leap else .not_leap;
var days: u9 = 0; var days: u9 = 0;
var month: u4 = 0; var month: u4 = 0;
while (month < max_month) : (month += 1) { while (month < max_month) : (month += 1) {
days += std.time.epoch.getDaysInMonth(leap_year, @enumFromInt(month + 1)); days += std.time.epoch.getDaysInMonth(year, @enumFromInt(month + 1));
} }
return days; return days;
} }

15
lib/std/time/epoch.zig
View File

@ -64,8 +64,6 @@ pub fn getDaysInYear(year: Year) u9 {
return if (isLeapYear(year)) 366 else 365; return if (isLeapYear(year)) 366 else 365;
} }
pub const YearLeapKind = enum(u1) { not_leap, leap };
pub const Month = enum(u4) { pub const Month = enum(u4) {
jan = 1, jan = 1,
feb, feb,
@ -87,13 +85,13 @@ pub const Month = enum(u4) {
} }
}; };
/// Get the number of days in the given month /// Get the number of days in the given month and year
pub fn getDaysInMonth(leap_year: YearLeapKind, month: Month) u5 { pub fn getDaysInMonth(year: Year, month: Month) u5 {
return switch (month) { return switch (month) {
.jan => 31, .jan => 31,
.feb => @as(u5, switch (leap_year) { .feb => @as(u5, switch (isLeapYear(year)) {
.leap => 29, true => 29,
.not_leap => 28, false => 28,
}), }),
.mar => 31, .mar => 31,
.apr => 30, .apr => 30,
@ -116,9 +114,8 @@ pub const YearAndDay = struct {
pub fn calculateMonthDay(self: YearAndDay) MonthAndDay { pub fn calculateMonthDay(self: YearAndDay) MonthAndDay {
var month: Month = .jan; var month: Month = .jan;
var days_left = self.day; var days_left = self.day;
const leap_kind: YearLeapKind = if (isLeapYear(self.year)) .leap else .not_leap;
while (true) { while (true) {
const days_in_month = getDaysInMonth(leap_kind, month); const days_in_month = getDaysInMonth(self.year, month);
if (days_left < days_in_month) if (days_left < days_in_month)
break; break;
days_left -= days_in_month; days_left -= days_in_month;