authorgravatar for hello@nektro.netMeghan Denny <hello@nektro.net> 2021-10-24 22:44:22 -07:00
committergravatar for hello@nektro.netMeghan Denny <hello@nektro.net> 2021-10-24 22:44:22 -07:00
log4ec378b2be4a26b56fabb0fd8f3db662edcafd28
tree2b488f93d1fe98188979cd2609cd5ef2bc0bbf93
parent7461890cb125559401758849fff289223b4b3c13

fix printer order

1 files changed, 12 insertions(+), 3 deletions(-)

time.zig+12-3
...@@ -223,24 +223,26 @@ pub const DateTime = struct {...@@ -223,24 +223,26 @@ pub const DateTime = struct {
223223
224 if (next) |tag| {224 if (next) |tag| {
225 switch (tag) {225 switch (tag) {
226 .ddd => try writer.writeAll(@tagName(self.weekday)),
227 .DD => try writer.print("{:0>2}", .{self.days + 1}),
228 .YYYY => try writer.print("{:0>4}", .{self.years}),
229 .MM => try writer.print("{:0>2}", .{self.months + 1}),226 .MM => try writer.print("{:0>2}", .{self.months + 1}),
230 .M => try writer.print("{}", .{self.months + 1}),227 .M => try writer.print("{}", .{self.months + 1}),
231 .Mo => try printOrdinal(writer, self.months + 1),228 .Mo => try printOrdinal(writer, self.months + 1),
232 .MMM => try printLongName(writer, self.months, &[_]string{ "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" }),229 .MMM => try printLongName(writer, self.months, &[_]string{ "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" }),
233 .MMMM => try printLongName(writer, self.months, &[_]string{ "January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December" }),230 .MMMM => try printLongName(writer, self.months, &[_]string{ "January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December" }),
231
234 .Q => try writer.print("{}", .{self.months / 3 + 1}),232 .Q => try writer.print("{}", .{self.months / 3 + 1}),
235 .Qo => try printOrdinal(writer, self.months / 3 + 1),233 .Qo => try printOrdinal(writer, self.months / 3 + 1),
234
236 .D => try writer.print("{}", .{self.days + 1}),235 .D => try writer.print("{}", .{self.days + 1}),
237 .Do => try printOrdinal(writer, self.days + 1),236 .Do => try printOrdinal(writer, self.days + 1),
237 .DD => try writer.print("{:0>2}", .{self.days + 1}),
238
238 .DDD => try writer.print("{}", .{self.dayOfThisYear() + 1}),239 .DDD => try writer.print("{}", .{self.dayOfThisYear() + 1}),
239 .DDDo => try printOrdinal(writer, self.dayOfThisYear() + 1),240 .DDDo => try printOrdinal(writer, self.dayOfThisYear() + 1),
240 .DDDD => try writer.print("{:0>3}", .{self.dayOfThisYear() + 1}),241 .DDDD => try writer.print("{:0>3}", .{self.dayOfThisYear() + 1}),
241 .d => try writer.print("{}", .{@enumToInt(self.weekday)}),242 .d => try writer.print("{}", .{@enumToInt(self.weekday)}),
242 .do => try printOrdinal(writer, @enumToInt(self.weekday)),243 .do => try printOrdinal(writer, @enumToInt(self.weekday)),
243 .dd => try writer.writeAll(@tagName(self.weekday)[0..2]),244 .dd => try writer.writeAll(@tagName(self.weekday)[0..2]),
245 .ddd => try writer.writeAll(@tagName(self.weekday)),
244 .dddd => try printLongName(writer, @enumToInt(self.weekday), &[_]string{ "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday" }),246 .dddd => try printLongName(writer, @enumToInt(self.weekday), &[_]string{ "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday" }),
245 .E => try writer.print("{}", .{@enumToInt(self.weekday) + 1}),247 .E => try writer.print("{}", .{@enumToInt(self.weekday) + 1}),
246 .w => try writer.print("{}", .{self.dayOfThisYear() / 7 + 1}),248 .w => try writer.print("{}", .{self.dayOfThisYear() / 7 + 1}),
...@@ -249,20 +251,27 @@ pub const DateTime = struct {...@@ -249,20 +251,27 @@ pub const DateTime = struct {
249 .Y => try writer.print("{}", .{self.years + 10000}),251 .Y => try writer.print("{}", .{self.years + 10000}),
250 .YY => try writer.print("{:0>2}", .{self.years % 100}),252 .YY => try writer.print("{:0>2}", .{self.years % 100}),
251 .YYY => try writer.print("{}", .{self.years}),253 .YYY => try writer.print("{}", .{self.years}),
254 .YYYY => try writer.print("{:0>4}", .{self.years}),
255
252 .N => try writer.writeAll(@tagName(self.era)),256 .N => try writer.writeAll(@tagName(self.era)),
253 .NN => try writer.writeAll("Anno Domini"),257 .NN => try writer.writeAll("Anno Domini"),
258
254 .A => try printLongName(writer, self.hours / 12, &[_]string{ "AM", "PM" }),259 .A => try printLongName(writer, self.hours / 12, &[_]string{ "AM", "PM" }),
255 .a => try printLongName(writer, self.hours / 12, &[_]string{ "am", "pm" }),260 .a => try printLongName(writer, self.hours / 12, &[_]string{ "am", "pm" }),
261
256 .H => try writer.print("{}", .{self.hours}),262 .H => try writer.print("{}", .{self.hours}),
257 .HH => try writer.print("{:0>2}", .{self.hours}),263 .HH => try writer.print("{:0>2}", .{self.hours}),
258 .h => try writer.print("{}", .{wrap(self.hours, 12)}),264 .h => try writer.print("{}", .{wrap(self.hours, 12)}),
259 .hh => try writer.print("{:0>2}", .{wrap(self.hours, 12)}),265 .hh => try writer.print("{:0>2}", .{wrap(self.hours, 12)}),
260 .k => try writer.print("{}", .{wrap(self.hours, 24)}),266 .k => try writer.print("{}", .{wrap(self.hours, 24)}),
261 .kk => try writer.print("{:0>2}", .{wrap(self.hours, 24)}),267 .kk => try writer.print("{:0>2}", .{wrap(self.hours, 24)}),
268
262 .m => try writer.print("{}", .{self.minutes}),269 .m => try writer.print("{}", .{self.minutes}),
263 .mm => try writer.print("{:0>2}", .{self.minutes}),270 .mm => try writer.print("{:0>2}", .{self.minutes}),
271
264 .s => try writer.print("{}", .{self.seconds}),272 .s => try writer.print("{}", .{self.seconds}),
265 .ss => try writer.print("{:0>2}", .{self.seconds}),273 .ss => try writer.print("{:0>2}", .{self.seconds}),
274
266 .S => try writer.print("{}", .{self.ms / 100}),275 .S => try writer.print("{}", .{self.ms / 100}),
267 .SS => try writer.print("{:0>2}", .{self.ms / 10}),276 .SS => try writer.print("{:0>2}", .{self.ms / 10}),
268 .SSS => try writer.print("{:0>3}", .{self.ms}),277 .SSS => try writer.print("{:0>3}", .{self.ms}),