authorgravatar for hello@nektro.netMeghan Denny <hello@nektro.net> 2025-12-17 18:21:48 -08:00
committergravatar for hello@nektro.netMeghan Denny <hello@nektro.net> 2025-12-17 18:21:48 -08:00
log8e356970bdf5b36e4b7d533deb1eb468ab542e8f
tree0582cd21676b71fd92145a16123a2fd4765e46fe
parentcd783ccfc1f17a23f96512d337b2d5d7b10787c7

DateTime: remove Self decl when type is not generic

1 files changed, 29 insertions(+), 31 deletions(-)

time.zig+29-31
...@@ -13,18 +13,16 @@ pub const DateTime = struct {...@@ -13,18 +13,16 @@ pub const DateTime = struct {
13 years: u16,13 years: u16,
14 timezone: TimeZone,14 timezone: TimeZone,
1515
16 const Self = @This();16 pub fn initUnixMs(unix: u64) DateTime {
17
18 pub fn initUnixMs(unix: u64) Self {
19 return epoch_unix.addMs(unix);17 return epoch_unix.addMs(unix);
20 }18 }
2119
22 pub fn initUnix(unix: u64) Self {20 pub fn initUnix(unix: u64) DateTime {
23 return epoch_unix.addSecs(unix);21 return epoch_unix.addSecs(unix);
24 }22 }
2523
26 /// Caller asserts that this is > epoch24 /// Caller asserts that this is > epoch
27 pub fn init(year: u16, month: u16, day: u16, hr: u16, min: u16, sec: u16, ms: u16) Self {25 pub fn init(year: u16, month: u16, day: u16, hr: u16, min: u16, sec: u16, ms: u16) DateTime {
28 return epoch_unix26 return epoch_unix
29 .addYears(year - epoch_unix.years)27 .addYears(year - epoch_unix.years)
30 .addMonths(month)28 .addMonths(month)
...@@ -35,11 +33,11 @@ pub const DateTime = struct {...@@ -35,11 +33,11 @@ pub const DateTime = struct {
35 .addMs(ms);33 .addMs(ms);
36 }34 }
3735
38 pub fn now() Self {36 pub fn now() DateTime {
39 return initUnixMs(@intCast(std.time.milliTimestamp()));37 return initUnixMs(@intCast(std.time.milliTimestamp()));
40 }38 }
4139
42 pub const epoch_unix = Self{40 pub const epoch_unix = DateTime{
43 .ms = 0,41 .ms = 0,
44 .seconds = 0,42 .seconds = 0,
45 .minutes = 0,43 .minutes = 0,
...@@ -50,7 +48,7 @@ pub const DateTime = struct {...@@ -50,7 +48,7 @@ pub const DateTime = struct {
50 .timezone = .UTC,48 .timezone = .UTC,
51 };49 };
5250
53 pub fn toISOString(self: Self) [20]u8 {51 pub fn toISOString(self: DateTime) [20]u8 {
54 // "2021-10-21T23:20:30Z"52 // "2021-10-21T23:20:30Z"
55 var result: [20]u8 = @splat(0);53 var result: [20]u8 = @splat(0);
56 var fbs = std.io.fixedBufferStream(&result);54 var fbs = std.io.fixedBufferStream(&result);
...@@ -60,7 +58,7 @@ pub const DateTime = struct {...@@ -60,7 +58,7 @@ pub const DateTime = struct {
60 return result;58 return result;
61 }59 }
6260
63 pub fn eql(self: Self, other: Self) bool {61 pub fn eql(self: DateTime, other: DateTime) bool {
64 return self.ms == other.ms and62 return self.ms == other.ms and
65 self.seconds == other.seconds and63 self.seconds == other.seconds and
66 self.minutes == other.minutes and64 self.minutes == other.minutes and
...@@ -72,35 +70,35 @@ pub const DateTime = struct {...@@ -72,35 +70,35 @@ pub const DateTime = struct {
72 self.weekday == other.weekday;70 self.weekday == other.weekday;
73 }71 }
7472
75 pub fn addMs(self: Self, count: u64) Self {73 pub fn addMs(self: DateTime, count: u64) DateTime {
76 if (count == 0) return self;74 if (count == 0) return self;
77 var result = self;75 var result = self;
78 result.ms += @intCast(count % 1000);76 result.ms += @intCast(count % 1000);
79 return result.addSecs(count / 1000);77 return result.addSecs(count / 1000);
80 }78 }
8179
82 pub fn addSecs(self: Self, count: u64) Self {80 pub fn addSecs(self: DateTime, count: u64) DateTime {
83 if (count == 0) return self;81 if (count == 0) return self;
84 var result = self;82 var result = self;
85 result.seconds += @intCast(count % 60);83 result.seconds += @intCast(count % 60);
86 return result.addMins(count / 60);84 return result.addMins(count / 60);
87 }85 }
8886
89 pub fn addMins(self: Self, count: u64) Self {87 pub fn addMins(self: DateTime, count: u64) DateTime {
90 if (count == 0) return self;88 if (count == 0) return self;
91 var result = self;89 var result = self;
92 result.minutes += @intCast(count % 60);90 result.minutes += @intCast(count % 60);
93 return result.addHours(count / 60);91 return result.addHours(count / 60);
94 }92 }
9593
96 pub fn addHours(self: Self, count: u64) Self {94 pub fn addHours(self: DateTime, count: u64) DateTime {
97 if (count == 0) return self;95 if (count == 0) return self;
98 var result = self;96 var result = self;
99 result.hours += @intCast(count % 24);97 result.hours += @intCast(count % 24);
100 return result.addDays(count / 24);98 return result.addDays(count / 24);
101 }99 }
102100
103 pub fn addDays(self: Self, count: u64) Self {101 pub fn addDays(self: DateTime, count: u64) DateTime {
104 if (count == 0) return self;102 if (count == 0) return self;
105 var result = self;103 var result = self;
106 var input = count;104 var input = count;
...@@ -157,12 +155,12 @@ pub const DateTime = struct {...@@ -157,12 +155,12 @@ pub const DateTime = struct {
157 return result;155 return result;
158 }156 }
159157
160 pub fn addWeeks(self: Self, count: u64) Self {158 pub fn addWeeks(self: DateTime, count: u64) DateTime {
161 if (count == 0) return self;159 if (count == 0) return self;
162 return self.addDays(7).addWeeks(count - 1);160 return self.addDays(7).addWeeks(count - 1);
163 }161 }
164162
165 pub fn addMonths(self: Self, count: u64) Self {163 pub fn addMonths(self: DateTime, count: u64) DateTime {
166 if (count == 0) return self;164 if (count == 0) return self;
167 var result = self;165 var result = self;
168 var input = count;166 var input = count;
...@@ -175,7 +173,7 @@ pub const DateTime = struct {...@@ -175,7 +173,7 @@ pub const DateTime = struct {
175 return result;173 return result;
176 }174 }
177175
178 pub fn addYears(self: Self, count: u64) Self {176 pub fn addYears(self: DateTime, count: u64) DateTime {
179 var result = self;177 var result = self;
180 for (0..count) |_| {178 for (0..count) |_| {
181 result = result.addDays(result.daysThisYear());179 result = result.addDays(result.daysThisYear());
...@@ -183,28 +181,28 @@ pub const DateTime = struct {...@@ -183,28 +181,28 @@ pub const DateTime = struct {
183 return result;181 return result;
184 }182 }
185183
186 pub fn addQuarters(self: Self, count: u64) Self {184 pub fn addQuarters(self: DateTime, count: u64) DateTime {
187 if (count == 0) return self;185 if (count == 0) return self;
188 return self.addMonths(3).addQuarters(count - 1);186 return self.addMonths(3).addQuarters(count - 1);
189 }187 }
190188
191 pub fn isLeapYear(self: Self) bool {189 pub fn isLeapYear(self: DateTime) bool {
192 return time.isLeapYear(self.years);190 return time.isLeapYear(self.years);
193 }191 }
194192
195 pub fn daysThisYear(self: Self) u16 {193 pub fn daysThisYear(self: DateTime) u16 {
196 return time.daysInYear(self.years);194 return time.daysInYear(self.years);
197 }195 }
198196
199 pub fn daysThisMonth(self: Self) u16 {197 pub fn daysThisMonth(self: DateTime) u16 {
200 return self.daysInMonth(self.months);198 return self.daysInMonth(self.months);
201 }199 }
202200
203 fn daysInMonth(self: Self, month: u16) u16 {201 fn daysInMonth(self: DateTime, month: u16) u16 {
204 return time.daysInMonth(self.years, month);202 return time.daysInMonth(self.years, month);
205 }203 }
206204
207 pub fn dayOfThisYear(self: Self) u16 {205 pub fn dayOfThisYear(self: DateTime) u16 {
208 var ret: u16 = 0;206 var ret: u16 = 0;
209 for (0..self.months) |item| {207 for (0..self.months) |item| {
210 ret += self.daysInMonth(@intCast(item));208 ret += self.daysInMonth(@intCast(item));
...@@ -213,12 +211,12 @@ pub const DateTime = struct {...@@ -213,12 +211,12 @@ pub const DateTime = struct {
213 return ret;211 return ret;
214 }212 }
215213
216 pub fn toUnix(self: Self) u64 {214 pub fn toUnix(self: DateTime) u64 {
217 const x = self.toUnixMilli();215 const x = self.toUnixMilli();
218 return x / 1000;216 return x / 1000;
219 }217 }
220218
221 pub fn toUnixMilli(self: Self) u64 {219 pub fn toUnixMilli(self: DateTime) u64 {
222 var res: u64 = 0;220 var res: u64 = 0;
223 res += self.ms;221 res += self.ms;
224 res += @as(u64, self.seconds) * ms_per_s;222 res += @as(u64, self.seconds) * ms_per_s;
...@@ -228,7 +226,7 @@ pub const DateTime = struct {...@@ -228,7 +226,7 @@ pub const DateTime = struct {
228 return res;226 return res;
229 }227 }
230228
231 fn daysSinceEpoch(self: Self) u64 {229 fn daysSinceEpoch(self: DateTime) u64 {
232 var res: u64 = 0;230 var res: u64 = 0;
233 res += self.days;231 res += self.days;
234 for (0..self.years - epoch_unix.years) |i| res += time.daysInYear(@intCast(i));232 for (0..self.years - epoch_unix.years) |i| res += time.daysInYear(@intCast(i));
...@@ -237,7 +235,7 @@ pub const DateTime = struct {...@@ -237,7 +235,7 @@ pub const DateTime = struct {
237 }235 }
238236
239 /// fmt is based on https://momentjs.com/docs/#/displaying/format/237 /// fmt is based on https://momentjs.com/docs/#/displaying/format/
240 pub fn format(self: Self, comptime fmt: string, options: std.fmt.FormatOptions, writer: anytype) !void {238 pub fn format(self: DateTime, comptime fmt: string, options: std.fmt.FormatOptions, writer: anytype) !void {
241 _ = options;239 _ = options;
242240
243 if (fmt.len == 0) @compileError("DateTime: format string can't be empty");241 if (fmt.len == 0) @compileError("DateTime: format string can't be empty");
...@@ -344,7 +342,7 @@ pub const DateTime = struct {...@@ -344,7 +342,7 @@ pub const DateTime = struct {
344 }342 }
345 }343 }
346344
347 pub fn formatAlloc(self: Self, alloc: std.mem.Allocator, comptime fmt: string) !string {345 pub fn formatAlloc(self: DateTime, alloc: std.mem.Allocator, comptime fmt: string) !string {
348 var list = std.ArrayList(u8).init(alloc);346 var list = std.ArrayList(u8).init(alloc);
349 defer list.deinit();347 defer list.deinit();
350348
...@@ -404,18 +402,18 @@ pub const DateTime = struct {...@@ -404,18 +402,18 @@ pub const DateTime = struct {
404 X, // unix402 X, // unix
405 };403 };
406404
407 pub fn since(self: Self, other_in_the_past: Self) Duration {405 pub fn since(self: DateTime, other_in_the_past: DateTime) Duration {
408 return Duration{406 return Duration{
409 .ms = self.toUnixMilli() - other_in_the_past.toUnixMilli(),407 .ms = self.toUnixMilli() - other_in_the_past.toUnixMilli(),
410 };408 };
411 }409 }
412410
413 pub fn era(self: Self) Era {411 pub fn era(self: DateTime) Era {
414 if (self.years >= 0) return .AD;412 if (self.years >= 0) return .AD;
415 @compileError("TODO");413 @compileError("TODO");
416 }414 }
417415
418 pub fn weekday(self: Self) WeekDay {416 pub fn weekday(self: DateTime) WeekDay {
419 var i = self.daysSinceEpoch() % 7;417 var i = self.daysSinceEpoch() % 7;
420 var result = WeekDay.Thu; // weekday of epoch_unix418 var result = WeekDay.Thu; // weekday of epoch_unix
421 while (i > 0) : (i -= 1) {419 while (i > 0) : (i -= 1) {